From 48746f6c62f159c7a09aa88bb0db816629cd4755 Mon Sep 17 00:00:00 2001
From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com>
Date: Tue, 18 Jul 2023 10:18:42 +0200
Subject: [PATCH] Witness: Fix Python 3.11 crash and fix Desert Laser hint
 (#1970)

---
 worlds/witness/hints.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/worlds/witness/hints.py b/worlds/witness/hints.py
index 2f9e7929..cf82d947 100644
--- a/worlds/witness/hints.py
+++ b/worlds/witness/hints.py
@@ -141,9 +141,8 @@ def get_priority_hint_items(multiworld: MultiWorld, player: int):
     }
 
     if is_option_enabled(multiworld, player, "shuffle_lasers"):
-        lasers = {
+        lasers = [
             "Symmetry Laser",
-            "Desert Laser",
             "Town Laser",
             "Keep Laser",
             "Swamp Laser",
@@ -153,14 +152,14 @@ def get_priority_hint_items(multiworld: MultiWorld, player: int):
             "Quarry Laser",
             "Bunker Laser",
             "Shadows Laser",
-        }
+        ]
 
-        if get_option_value(multiworld, player, "doors") >= 2:
+        if get_option_value(multiworld, player, "shuffle_doors") >= 2:
             priority.add("Desert Laser")
-            lasers.remove("Desert Laser")
             priority.update(multiworld.per_slot_randoms[player].sample(lasers, 5))
 
         else:
+            lasers.append("Desert Laser")
             priority.update(multiworld.per_slot_randoms[player].sample(lasers, 6))
 
     return priority