From af9b61ad7dd04ba00e724c576fd1646071faa823 Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Wed, 11 Mar 2026 10:08:54 -0600
Subject: [PATCH] fix: beemizer + pottery + multiworld generation issue

---
 Fill.py             | 9 +++++++--
 Main.py             | 2 +-
 PastReleaseNotes.md | 3 +++
 RELEASENOTES.md     | 5 ++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Fill.py b/Fill.py
index 349ff83e..935dad37 100644
--- a/Fill.py
+++ b/Fill.py
@@ -608,8 +608,13 @@ def fast_fill_pot_for_multiworld(world, item_pool, fill_locations):
         flex = 256 - world.data_tables[player].pot_secret_table.multiworld_count
         fill_count = len(pot_fill_locations[player]) - flex
         if fill_count > 0:
-            fill_spots = random.sample(pot_fill_locations[player], fill_count)
-            fill_items = random.sample(pot_item_pool[player], fill_count)
+            first_count = min(fill_count, len(pot_item_pool[player]))
+            fill_items = random.sample(pot_item_pool[player], first_count)
+            remaining = fill_count - first_count
+            if remaining > 0:
+                other_items = [i for i in item_pool if i.player == player and i not in pot_item_pool[player]]
+                fill_items += random.sample(other_items, min(remaining, len(other_items)))
+            fill_spots = random.sample(pot_fill_locations[player], len(fill_items))
             for x in fill_items:
                 item_pool.remove(x)
             for x in fill_spots:
diff --git a/Main.py b/Main.py
index 3e3a3952..d6925fbd 100644
--- a/Main.py
+++ b/Main.py
@@ -38,7 +38,7 @@ from source.enemizer.DamageTables import DamageTable
 from source.enemizer.Enemizer import randomize_enemies
 from source.rom.DataTables import init_data_tables
 
-version_number = '1.5.5'
+version_number = '1.5.6'
 version_branch = '-u'
 __version__ = f'{version_number}{version_branch}'
 
diff --git a/PastReleaseNotes.md b/PastReleaseNotes.md
index e2915b60..d7984bec 100644
--- a/PastReleaseNotes.md
+++ b/PastReleaseNotes.md
@@ -10,6 +10,9 @@
 # Patch Notes
 
 Changelog archive
+* 1.5.5
+  * Logic: Fixed an issue where PoD Bridge lead to Arena Main instead of Arena Landing Area. (Potentially unnecessarily requiring bombs or Somaria to progress)
+  * HUD: Key counters are correct even when door shuffle is off
 * 1.5.4
   * Documentation: New AI-assisted documentation [Site](https://aerinon.github.io/ALttPDoorRandomizer)
   * Generation Error: Fixed Issue with Shop Code and Take Any Caves (thanks Codemann for assistance)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 86d2c0f2..0a098615 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,7 +1,6 @@
 # Patch Notes
 
-* 1.5.5
-  * Logic: Fixed an issue where PoD Bridge lead to Arena Main instead of Arena Landing Area. (Potentially unnecessarily requiring bombs or Somaria to progress)
-  * HUD: Key counters are correct even when door shuffle is off
+* 1.5.6
+  * Multiworld: Fixed a generation crash when beemizer is active and pottery is enabled. Pot locations are now properly filled with same-player items when the MW limit is hit even when beemizer has replaced native pot items.