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

lufia2ac: prevent 0 byte reads (#3168)

This commit is contained in:
el-u 2024-04-18 18:34:26 +02:00 committed by GitHub
parent 6e56f31398
commit 52c1b04fc8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/lufia2ac/Client.py
View File

@ -118,10 +118,11 @@ class L2ACSNIClient(SNIClient):
snes_buffered_write(ctx, L2AC_TX_ADDR + 8, total_blue_chests_checked.to_bytes(2, "little")) snes_buffered_write(ctx, L2AC_TX_ADDR + 8, total_blue_chests_checked.to_bytes(2, "little"))
location_ids: List[int] = [locations_start_id + i for i in range(total_blue_chests_checked)] location_ids: List[int] = [locations_start_id + i for i in range(total_blue_chests_checked)]
loc_data: Optional[bytes] = await snes_read(ctx, L2AC_TX_ADDR + 32, snes_other_locations_checked * 2) if snes_other_locations_checked:
if loc_data is not None: loc_data: Optional[bytes] = await snes_read(ctx, L2AC_TX_ADDR + 32, snes_other_locations_checked * 2)
location_ids.extend(locations_start_id + int.from_bytes(loc_data[2 * i:2 * i + 2], "little") if loc_data is not None:
for i in range(snes_other_locations_checked)) location_ids.extend(locations_start_id + int.from_bytes(loc_data[2 * i:2 * i + 2], "little")
for i in range(snes_other_locations_checked))
if new_location_ids := [loc_id for loc_id in location_ids if loc_id not in ctx.locations_checked]: if new_location_ids := [loc_id for loc_id in location_ids if loc_id not in ctx.locations_checked]:
await ctx.send_msgs([{"cmd": "LocationChecks", "locations": new_location_ids}]) await ctx.send_msgs([{"cmd": "LocationChecks", "locations": new_location_ids}])