monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor cleanup

This commit is contained in:
Fabian Dill 2021-02-28 20:48:30 +01:00
parent 1849693353
commit 07b9fcfefc
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NetUtils.py
View File

@ -7,6 +7,7 @@ from json import JSONEncoder, JSONDecoder
import websockets import websockets
from Utils import Version
class JSONMessagePart(typing.TypedDict): class JSONMessagePart(typing.TypedDict):
type: typing.Optional[str] type: typing.Optional[str]
@ -55,7 +56,6 @@ _encode = JSONEncoder(
def encode(obj): def encode(obj):
return _encode(_scan_for_TypedTuples(obj)) return _encode(_scan_for_TypedTuples(obj))
from Utils import Version # for object hook
whitelist = {"NetworkPlayer": NetworkPlayer, whitelist = {"NetworkPlayer": NetworkPlayer,
"NetworkItem": NetworkItem, "NetworkItem": NetworkItem,
"Version": Version} "Version": Version}

3
worlds/alttp/Rom.py
View File

@ -701,9 +701,6 @@ def patch_rom(world, rom, player, team, enemized):
itemid = location.item.code if location.item is not None else 0x5A 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 not location.crystal:
if location.item is not None: if location.item is not None: