Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-04-03 14:37:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
luyijun 2014-10-22 00:37:49 +08:00
commit 73e57422c7
13 changed files with 66 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/utils/create.py
View file

@ -305,11 +305,15 @@ def create_script(typeclass, key=None, obj=None, player=None, locks=None,
if persistent is not None:
new_script.persistent = persistent
# must do this before starting the script since some
# scripts may otherwise run for a very short time and
# try to delete itself before we have a time to save it.
new_db_script.save()
# a new created script should usually be started.
if autostart:
new_script.start()
new_db_script.save()
return new_script
#alias
script = create_script

3
src/utils/utils.py
View file

@ -782,7 +782,8 @@ def mod_import(module):
def all_from_module(module):
"""
Return all global-level variables from a module as a dict
Return all global-level variables from a module as a dict.
Ignores modules and variable names starting with an underscore.
"""
mod = mod_import(module)
if not mod: