2 files changed, 4 insertions, 1 deletions

@@ -277,7 +277,7 @@ class Lingo2ClientContext(CommonContext):
                 "operations": [{"operation": "default", "value": 0}]
             }]
 
-            if self.slot_data["shuffle_worldports"]:
+            if self.slot_data.get("shuffle_worldports", False):
                 self.set_notify(self.get_datastorage_key("worldports"))
                 msg_batch.append({
                     "cmd": "Set",
@@ -75,6 +75,9 @@ def create_regions(world: "Lingo2World"):
         if connection.roof_access and not world.options.daedalus_roof_access:
             continue
 
+        if connection.vanilla_only and world.options.shuffle_doors:
+            continue
+
         from_region = world.static_logic.get_room_region_name(connection.from_room)
         to_region = world.static_logic.get_room_region_name(connection.to_room)