about summary refs log tree commit diff stats
path: root/apworld
diff options
context:
space:
mode:
Diffstat (limited to 'apworld')
-rw-r--r--apworld/__init__.py2
-rw-r--r--apworld/context.py7
-rw-r--r--apworld/player_logic.py2
3 files changed, 4 insertions, 7 deletions
diff --git a/apworld/__init__.py b/apworld/__init__.py index 96f6804..1d12050 100644 --- a/apworld/__init__.py +++ b/apworld/__init__.py
@@ -11,7 +11,7 @@ from .options import Lingo2Options
11from .player_logic import Lingo2PlayerLogic 11from .player_logic import Lingo2PlayerLogic
12from .regions import create_regions, shuffle_entrances, connect_ports_from_ut 12from .regions import create_regions, shuffle_entrances, connect_ports_from_ut
13from .static_logic import Lingo2StaticLogic 13from .static_logic import Lingo2StaticLogic
14from ..LauncherComponents import Component, Type, components, launch as launch_component, icon_paths 14from worlds.LauncherComponents import Component, Type, components, launch as launch_component, icon_paths
15 15
16 16
17class Lingo2WebWorld(WebWorld): 17class Lingo2WebWorld(WebWorld):
diff --git a/apworld/context.py b/apworld/context.py index 63645a4..e78ce35 100644 --- a/apworld/context.py +++ b/apworld/context.py
@@ -254,11 +254,8 @@ class Lingo2ClientContext(CommonContext):
254 return ui 254 return ui
255 255
256 async def server_auth(self, password_requested: bool = False): 256 async def server_auth(self, password_requested: bool = False):
257 if password_requested: 257 if password_requested and not self.password:
258 if self.password is None: 258 self.manager.game_ctx.send_connection_refused("Invalid password.")
259 self.manager.game_ctx.send_connection_refused("Slot requires a password.")
260 else:
261 self.manager.game_ctx.send_connection_refused("Invalid password.")
262 else: 259 else:
263 self.auth = self.username 260 self.auth = self.username
264 await self.send_connect() 261 await self.send_connect()
diff --git a/apworld/player_logic.py b/apworld/player_logic.py index 5be066d..3ed1bb1 100644 --- a/apworld/player_logic.py +++ b/apworld/player_logic.py
@@ -4,7 +4,7 @@ from .generated import data_pb2 as data_pb2
4from .items import SYMBOL_ITEMS 4from .items import SYMBOL_ITEMS
5from typing import TYPE_CHECKING, NamedTuple 5from typing import TYPE_CHECKING, NamedTuple
6 6
7from .options import VictoryCondition, ShuffleLetters, CyanDoorBehavior 7from .options import ShuffleLetters, CyanDoorBehavior
8 8
9if TYPE_CHECKING: 9if TYPE_CHECKING:
10 from . import Lingo2World 10 from . import Lingo2World