diff --git a/NetUtils.py b/NetUtils.py index e26dc0ce..ce59fcb1 100644 --- a/NetUtils.py +++ b/NetUtils.py @@ -7,6 +7,7 @@ from json import JSONEncoder, JSONDecoder import websockets +from Utils import Version class JSONMessagePart(typing.TypedDict): type: typing.Optional[str] @@ -55,7 +56,6 @@ _encode = JSONEncoder( def encode(obj): return _encode(_scan_for_TypedTuples(obj)) -from Utils import Version # for object hook whitelist = {"NetworkPlayer": NetworkPlayer, "NetworkItem": NetworkItem, "Version": Version} diff --git a/worlds/alttp/Rom.py b/worlds/alttp/Rom.py index 935e5bb3..d5733ae2 100644 --- a/worlds/alttp/Rom.py +++ b/worlds/alttp/Rom.py @@ -701,9 +701,6 @@ def patch_rom(world, rom, player, team, enemized): itemid = location.item.code if location.item is not None else 0x5A - if location.item.game != "A Link to the Past": - itemid = itemid - if not location.crystal: if location.item is not None: