Merge branch 'main' into breaking_changes

# Conflicts:
#	MultiClient.py
#	WebUI.py
This commit is contained in:
Fabian Dill
2021-01-21 05:36:16 +01:00
11 changed files with 220 additions and 116 deletions

View File

@@ -2251,7 +2251,10 @@ def plando_connect(world, player: int):
if world.plando_connections[player]:
for connection in world.plando_connections[player]:
func = lookup[connection.direction]
func(world, connection.entrance, connection.exit, player)
try:
func(world, connection.entrance, connection.exit, player)
except Exception as e:
raise Exception(f"Could not connect using {connection}") from e
LW_Dungeon_Entrances = ['Desert Palace Entrance (South)',