put everything in the item and dialog queue rather than attempting to…

… unlock in place
alwaysintreble · Jan 3, 2024 · d89d0e2 · d89d0e2
1 parent debc774
commit d89d0e2
Showing 1 changed file with 2 additions and 19 deletions.
diff --git a/Archipelago/ArchipelagoClient.cs b/Archipelago/ArchipelagoClient.cs
@@ -202,7 +202,7 @@ private static void OnMessageReceived(LogMessage message)
                     case ItemSendLogMessage itemSendMessage:
                         if (itemSendMessage.IsRelatedToActivePlayer)
                         {
-                            if (!itemSendMessage.IsReceiverTheActivePlayer && !ItemsAndLocationsHandler.HasDialog(itemSendMessage.Item.Location))
+                            if (!ItemsAndLocationsHandler.HasDialog(itemSendMessage.Item.Location))
                             {
                                 Console.WriteLine($"adding {itemSendMessage.Item.ToReadableString()} to dialog queue.");
                                 DialogQueue.Enqueue(itemSendMessage.Item.ToReadableString(itemSendMessage.Receiver.Alias));
@@ -282,24 +282,7 @@ private static void OnItemReceived(ReceivedItemsHelper helper)
             if (helper.Index < ServerData.Index) return;
 
             ServerData.Index++;
-            if (RandomizerStateManager.IsSafeTeleportState() &&
-                !Manager<PauseManager>.Instance.IsPaused)
-            {
-                try
-                {
-                    ItemsAndLocationsHandler.Unlock(itemToUnlock.Item);
-                }
-                catch (Exception e)
-                {
-                    Debug.Log(e);
-                    ItemQueue.Enqueue(itemToUnlock.Item);
-                }
-            }
-            else
-                ItemQueue.Enqueue(itemToUnlock.Item);
-            if (itemToUnlock.Player.Equals(Session.ConnectionInfo.Slot) &&
-                ItemsAndLocationsHandler.HasDialog(itemToUnlock.Location))
-                return;
+            ItemQueue.Enqueue(itemToUnlock.Item);
             DialogQueue.Enqueue(itemToUnlock.ToReadableString());
         }