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

Avoid inf recursion when deleting script from at_stop. Resolve #2642

Browse source
This commit is contained in:
Griatch 2022-02-12 20:19:35 +01:00
parent a19211f3fd
commit 29430d8d0f
2 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
evennia/commands/default/building.py
View file

@ -3373,7 +3373,7 @@ class CmdScripts(COMMAND_DEFAULT_CLASS):
obj_query = script_query = self.args
scripts = self._search_script(script_query)
objects = ObjectDB.objects.object_search(obj_query)
objects = caller.search(obj_query, quiet=True)
obj = objects[0] if objects else None
if not self.switches:
@ -3461,7 +3461,10 @@ class CmdScripts(COMMAND_DEFAULT_CLASS):
)
caller.msg("\n".join(msgs))
if "delete" not in self.switches:
ScriptEvMore(caller, [script], session=self.session)
if script and script.pk:
ScriptEvMore(caller, [script], session=self.session)
else:
caller.msg("Script was deleted automatically.")
else:
caller.msg("No scripts found.")