fix soft lock from receiving shop items multiple times

alwaysintreble · Dec 1, 2023 · 44777df · 44777df
1 parent 5f8daba
commit 44777df
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
@@ -189,7 +189,7 @@ public static void SyncLocations()
                 catch (Exception e)
                 {
                     Console.WriteLine(e);
-                    Console.WriteLine($"{Session.Locations.GetLocationNameFromId(location)} {location}");
+                    Console.WriteLine($"{Session.Locations.GetLocationNameFromId(location)}: {location}");
                 }
             }
         }

diff --git a/Archipelago/ItemsAndLocationsHandler.cs b/Archipelago/ItemsAndLocationsHandler.cs
@@ -376,13 +376,25 @@ public static void Unlock(long itemToUnlock, int quantity = APQuantity)
                     }
                     break;
                 default:
-                    Manager<InventoryManager>.Instance.AddItem(randoItem.Item, quantity);
                     Console.WriteLine($"Checking if {randoItem.Item} is a shop item: {ShopItem(randoItem.Item)}");
                     if (ShopItem(randoItem.Item))
                     {
                         // don't award shuriken twice if we already got it from windmill shuriken
                         if (randoItem.Item.Equals(EItems.SHURIKEN) &
                             ArchipelagoClient.ServerData.ReceivedItems.ContainsKey(itemToUnlock)) return;
+                        if (!new List<EItems> { EItems.HEART_CONTAINER, EItems.SHURIKEN_UPGRADE }.Contains(
+                                randoItem.Item))
+                        {
+                            Console.WriteLine($"checking if {itemToUnlock} has been received already");
+                            if (ArchipelagoClient.ServerData.ReceivedItems.ContainsKey(itemToUnlock))
+                            {
+                                Console.WriteLine("bailing");
+                                return;
+                            }
+                        }
+                        else if (ArchipelagoClient.ServerData.ReceivedItems.TryGetValue(itemToUnlock, out var count) &&
+                                 count > 1) return;
+                        Manager<InventoryManager>.Instance.AddItem(randoItem.Item, quantity);
                         var view = Manager<UIManager>.Instance.GetView<InGameHud>();
                         view.UpdateMaxHeart();
                         view.UpdateMaxMana();