mirror of
https://github.com/evennia/evennia.git
synced 2026-03-28 18:47:16 +01:00
Fixed an elusive bug in utils.get_variable_from_module() that caused the connection screen to sometimes not load properly, due to the imported modules being erroneously extracted and used.
This commit is contained in:
parent
5264dc85bb
commit
6501f30cbc
7 changed files with 80 additions and 78 deletions
|
|
@ -40,7 +40,6 @@ from traceback import format_exc
|
|||
from twisted.internet.defer import inlineCallbacks, returnValue
|
||||
from django.conf import settings
|
||||
from src.comms.channelhandler import CHANNELHANDLER
|
||||
from src.commands.cmdsethandler import import_cmdset
|
||||
from src.utils import logger, utils
|
||||
from src.commands.cmdparser import at_multimatch_cmd
|
||||
|
||||
|
|
@ -150,7 +149,6 @@ def get_and_merge_cmdsets(caller):
|
|||
|
||||
for cset in (cset for cset in local_objects_cmdsets if cset):
|
||||
cset.duplicates = cset.old_duplicates
|
||||
|
||||
returnValue(cmdset)
|
||||
|
||||
|
||||
|
|
@ -255,7 +253,6 @@ def cmdhandler(caller, raw_string, testing=False):
|
|||
caller.ndb.last_cmd = yield copy(cmd)
|
||||
else:
|
||||
caller.ndb.last_cmd = None
|
||||
|
||||
# Done! This returns a deferred. By default, Evennia does
|
||||
# not use this at all.
|
||||
returnValue(ret)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue