Merge pull request #45 from edgegamers/dev

Dev
edgegamers · Dec 18, 2024 · 902254d · 902254d
2 parents f522ff2 + 9907a80
commit 902254d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/GangsImpl/AbstractDB/AbstractInstanceManager.cs b/src/GangsImpl/AbstractDB/AbstractInstanceManager.cs
@@ -26,7 +26,7 @@ public abstract class AbstractInstanceManager<TK>(string connectionString,
         $"SELECT {(typeof(TV).IsBasicallyPrimitive() ? statId : GetFieldNames<TV>())} FROM {table_prefix}_{statId} WHERE {PrimaryKey} = @{PrimaryKey}",
         dynamic);
       if (result == null) return (true, result);
-      if (!cache.ContainsKey(statId)) cache[statId] = new();
+      if (!cache.ContainsKey(statId)) cache[statId] = new Dictionary<TK, object>();
       cache[statId][key] = result;
       return (true, result);
     } catch (InvalidOperationException e) {

diff --git a/src/GangsImpl/Stats/Perk/Smoke/SmokeColorMenu.cs b/src/GangsImpl/Stats/Perk/Smoke/SmokeColorMenu.cs
@@ -41,8 +41,9 @@ override protected Task<List<SmokeColor>> GetItems(PlayerWrapper player) {
 
   override protected Task HandleItemSelection(PlayerWrapper player,
     List<SmokeColor> items, int selectedIndex) {
-    commands.ProcessCommand(player, CommandCallingContext.Chat, "css_gang",
-      "smokecolor", items[selectedIndex].ToString());
+    if (selectedIndex > 0)
+      commands.ProcessCommand(player, CommandCallingContext.Chat, "css_gang",
+        "smokecolor", items[selectedIndex].ToString());
     Close(player);
     return Task.CompletedTask;
   }

diff --git a/src/GangsImpl/Stats/Perk/Smoke/SmokeListener.cs b/src/GangsImpl/Stats/Perk/Smoke/SmokeListener.cs
@@ -72,7 +72,7 @@ await gangStats.GetForGang<SmokePerkData>(gang,
           continue;
         }
 
-        color = data.Equipped.GetColor() ?? data.Equipped.PickRandom();
+        color = data.Equipped.GetColor() ?? data.Unlocked.PickRandom();
         cachedGangs.Add(player.GangId.Value, color);
       }