Merge pull request #5 from UncomplicatedCustomServer/dev-labapi

UCEZ v1.0.0 - First Release

Author: MedveMarci

UncomplicatedCustomEscapeZones/Config.cs

@@ -10,4 +10,7 @@ internal class Config
     [Description(
         "If false the UCS credit tag system won't be activated. PLEASE DON'T DEACTIVATE IT as LOTS OF PEOPLE WORKED ON THIS PLUGIN completly for FREE!")]
     public bool EnableCreditTags { get; set; } = true;
+    
+    [Description("Do enable the basic UCEZ logs?")]
+    public bool EnableBasicLogs { get; set; } = true;
 }

UncomplicatedCustomEscapeZones/Events/EventHandler.cs

@@ -110,6 +110,7 @@ public override void OnServerWaitingForPlayers()
 
         foreach (ICustomEscapeZone customEscapeZone in CustomEscapeZone.List) new SummonedEscapeZone(customEscapeZone);
 
+        if (!Plugin.Instance.Config.EnableBasicLogs) return;
         LogManager.Info(
             $"Thanks for using UncomplicatedCustomEscapeZones v{Plugin.Instance.Version.ToString(3)} by {Plugin.Instance.Author}! Note that if you're using UCR, this plugin is the higher priority.",
             ConsoleColor.Blue);

UncomplicatedCustomEscapeZones/Intergrations/UCR.cs

@@ -88,16 +88,40 @@ public static bool TryGetSummonedCustomRole(Player player, out object summonedCu
             return false;
         }
 
-        if (SummonedCustomRole?.GetProperty("List", BindingFlags.Public | BindingFlags.Static)?.GetValue(null) is not
-            IEnumerable list)
+        object listObj = SummonedCustomRole?.GetProperty("List", BindingFlags.Public | BindingFlags.Static)?.GetValue(null);
+
+        if (listObj is not IEnumerable list)
             return false;
 
-        foreach (object scr in list)
+        object[] entries = list.Cast<object>().ToArray();
+        LogManager.Debug($"Found SummonedCustomRole.List with {entries.Length} entries.");
+
+        foreach (object entry in entries)
         {
-            object scrPlayer = scr.GetType().GetProperty("Player")?.GetValue(scr);
-            PropertyInfo playerIdProp = scrPlayer?.GetType().GetProperty("PlayerId");
-            if (playerIdProp == null || playerIdProp.GetValue(scrPlayer)?.Equals(player.PlayerId) != true) continue;
-            summonedCustomRole = scr;
+            object candidate = entry;
+            PropertyInfo valueProp = entry.GetType().GetProperty("Value");
+            if (valueProp != null)
+            {
+                object value = valueProp.GetValue(entry);
+                if (value != null)
+                    candidate = value;
+            }
+
+            LogManager.Debug($"Examining entry candidate: {candidate}");
+
+            object scrPlayer = candidate.GetType().GetProperty("Player")?.GetValue(candidate);
+            LogManager.Debug($"Player property value: {scrPlayer}");
+            if (scrPlayer is null)
+                continue;
+
+            PropertyInfo playerIdProp = scrPlayer.GetType().GetProperty("PlayerId");
+            LogManager.Debug($"PlayerId property: {playerIdProp}");
+            object idObj = playerIdProp?.GetValue(scrPlayer);
+            LogManager.Debug($"Found PlayerId value: {idObj}");
+
+            if (idObj is not int foundId || foundId != player.PlayerId) continue;
+            summonedCustomRole = candidate;
+            LogManager.Debug($"Matched SummonedCustomRole for PlayerId {player.PlayerId}: {candidate}");
             return true;
         }