mirror of
https://github.com/evennia/evennia.git
synced 2026-03-27 18:26:32 +01:00
Merge branch 'master' into develop
This commit is contained in:
commit
286e86bbdb
5 changed files with 12 additions and 10 deletions
|
|
@ -24,6 +24,7 @@ from evennia.utils import search
|
|||
from evennia.utils import logger
|
||||
from evennia.utils import ansi
|
||||
from evennia.utils.utils import (
|
||||
class_from_module,
|
||||
variable_from_module,
|
||||
lazy_property,
|
||||
make_iter,
|
||||
|
|
@ -40,6 +41,7 @@ _ScriptDB = None
|
|||
_SESSIONS = None
|
||||
|
||||
_AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
|
||||
_COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS)
|
||||
# the sessid_max is based on the length of the db_sessid csv field (excluding commas)
|
||||
_SESSID_MAX = 16 if _MULTISESSION_MODE in (1, 3) else 1
|
||||
|
||||
|
|
@ -2431,8 +2433,7 @@ class DefaultRoom(DefaultObject):
|
|||
# Default Exit command, used by the base exit object
|
||||
#
|
||||
|
||||
|
||||
class ExitCommand(command.Command):
|
||||
class ExitCommand(_COMMAND_DEFAULT_CLASS):
|
||||
"""
|
||||
This is a command that simply cause the caller to traverse
|
||||
the object it is attached to.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue