Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Sripthandler.add not fail if passed instantiated script. Resolve #3272

Browse source
This commit is contained in:
Griatch 2023-09-23 22:45:11 +02:00
parent cf38de0922
commit 808bde0c7c
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
evennia/scripts/scripthandler.py
View file

@ -76,10 +76,14 @@ class ScriptHandler(object):
script = create.create_script(
scriptclass, key=key, account=self.obj, autostart=autostart
)
else:
# adding to an Object. We wait to autostart so we can differentiate
# a failing creation from a script that immediately starts/stops.
elif isinstance(scriptclass, str) or callable(scriptclass):
# a str or class to use create before adding to an Object. We wait to autostart
# so we can differentiate a failing creation from a script that immediately starts/stops.
script = create.create_script(scriptclass, key=key, obj=self.obj, autostart=False)
else:
# already an instantiated class
script = scriptclass
if not script:
logger.log_err(f"Script {scriptclass} failed to be created.")
return None