[IN PROGRESS] Ultra Cleanup

CoreAdvanced.cs

@@ -2429,7 +2429,7 @@ public CapeSpecial CurrentCapeSpecial()
         if (EquippedCape == null)
             return CapeSpecial.None;
         int patternId = EquippedCape.EnhancementPatternID;
-        if (Enum.IsDefined(typeof(EnhancementType), patternId))
+        if (!Enum.IsDefined(typeof(CapeSpecial), patternId))
             return CapeSpecial.None;
         return (CapeSpecial)patternId;
     }
@@ -2447,7 +2447,7 @@ public HelmSpecial CurrentHelmSpecial()
             return HelmSpecial.None;
         int patternId = EquippedHelm.EnhancementPatternID;
 
-        if (Enum.IsDefined(typeof(EnhancementType), patternId))
+        if (!Enum.IsDefined(typeof(HelmSpecial), patternId))
             return HelmSpecial.None;
         return (HelmSpecial)patternId;
     }
@@ -2465,7 +2465,7 @@ public WeaponSpecial CurrentWeaponSpecial()
             return WeaponSpecial.None;
         int patternId = EquippedWeapon.EnhancementPatternID;
 
-        if (Enum.IsDefined(typeof(EnhancementType), patternId))
+        if (!Enum.IsDefined(typeof(WeaponSpecial), patternId))
             return WeaponSpecial.None;
         return (WeaponSpecial)patternId;
     }
@@ -2829,7 +2829,19 @@ void _AutoEnhance(InventoryItem item, int shopID, string? map = null, bool loggi
             bool specialOnCape = item.Category == ItemCategory.Cape && cSpecial != CapeSpecial.None;
             bool specialOnHelm = item.Category == ItemCategory.Helm && hSpecial != HelmSpecial.None;
             bool specialOnWeapon = item.ItemGroup == "Weapon" && wSpecial.ToString() != "None";
-            string mapName = map ?? Bot.Map?.Name ?? "whitemap";
+            string sourceMap = map;
+            string mapName =
+                string.IsNullOrWhiteSpace(map)
+                    ? string.IsNullOrWhiteSpace(Bot.Map?.Name)
+                        ? "whitemap"
+                        : Bot.Map.Name
+                    : map;
+
+            if (string.IsNullOrWhiteSpace(sourceMap))
+                Core.Logger(
+                    $"Enhance: map input was blank for {item.Name}[{item.ID}], using fallback map '{mapName}'."
+                );
+
             List<ShopItem> shopItems = Core.GetShopItems(mapName, shopID);
 
             // Shopdata complete check

CoreBots.cs

@@ -2507,6 +2507,12 @@ public void SellItem(int itemID, int quant = 1, bool all = false)
     /// <returns>A list of <see cref="ShopItem"/> objects from the specified shop, or an empty list if the shop data could not be loaded.</returns>
     public List<ShopItem> GetShopItems(string map, int shopID)
     {
+        string originalMap = map;
+        map = string.IsNullOrWhiteSpace(map) ? "whitemap" : map.Trim();
+
+        if (!string.Equals(originalMap, map, StringComparison.Ordinal))
+            Logger($"GetShopItems: map input '{originalMap}' normalized to '{map}'.");
+
         // Ensure player is in map
         if (!Bot.Map.Name.Equals(map, StringComparison.OrdinalIgnoreCase))
         {
@@ -8854,9 +8860,9 @@ public void Join(
         bool ignoreCheck = false
     )
     {
-        if (string.IsNullOrEmpty(map))
+        if (string.IsNullOrWhiteSpace(map))
         {
-            Logger("Map is null, cannot join.");
+            Logger("Map is null/blank, cannot join.");
             return;
         }
 
@@ -8865,7 +8871,16 @@ public void Join(
             PrivateRoomNumber = int.Parse(PrivateRoomNumber.ToString()[..6]);
         }
 
-        map = map!.Replace(" ", "").Replace('I', 'i');
+        string originalMap = map;
+        map = map!.Trim().Replace(" ", "").Replace('I', 'i');
+        if (!string.Equals(originalMap, map, StringComparison.Ordinal))
+            Logger($"Join(): sanitized map from '{originalMap}' to '{map}'.");
+
+        if (string.IsNullOrWhiteSpace(map))
+        {
+            Logger("Join(): map resolved to blank after sanitize, aborting join to avoid invalid /join input.");
+            return;
+        }
         map = map.ToLower() == "tercess" ? "tercessuinotlim" : map.ToLower();
         string strippedMap = map.Contains('-') ? map.Split('-').First() : map;
         cell =
@@ -8876,6 +8891,9 @@ public void Join(
         if (Bot.Map.Name != null && Bot.Map.Name.ToLower() == strippedMap && !ignoreCheck)
             return;
 
+        if (Bot.Map.Name != null && Bot.Map.Name != strippedMap)
+            Logger($"Join(): transitioning from '{Bot.Map.Name}' to '{strippedMap}'.");
+
         //if aggro/aggroall is enabled when joining a map, disable it [forced]
         Bot.Options.AggroMonsters = false;
         Bot.Options.AggroAllMonsters = false;