Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-26 17:56:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix syscommand regression (see #2755)

Browse source
This commit is contained in:
Griatch 2022-08-02 16:06:40 +02:00
parent 280c3f777a
commit eeaf1d3f58
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
evennia/commands/cmdset.py
View file

@ -27,6 +27,7 @@ Set theory.
"""
from weakref import WeakKeyDictionary
from django.utils.translation import gettext as _
from evennia.utils.utils import inherits_from, is_iter
@ -571,9 +572,13 @@ class CmdSet(object, metaclass=_CmdSetMeta):
"""
if isinstance(cmd, str):
cmd = next((_cmd for _cmd in self.commands if _cmd.key == cmd), None)
if cmd is None:
return None
_cmd = next((_cmd for _cmd in self.commands if _cmd.key == cmd), None)
if _cmd is None:
if not cmd.startswith("__"):
# if a syscommand, keep the original string and instantiate on it
return None
else:
cmd = _cmd
cmd = self._instantiate(cmd)
if cmd.key.startswith("__"):
@ -599,9 +604,13 @@ class CmdSet(object, metaclass=_CmdSetMeta):
"""
if isinstance(cmd, str):
cmd = next((_cmd for _cmd in self.commands if _cmd.key == cmd), None)
if cmd is None:
return None
_cmd = next((_cmd for _cmd in self.commands if _cmd.key == cmd), None)
if _cmd is None:
if not cmd.startswith("__"):
# if a syscommand, keep the original string and instantiate on it
return None
else:
cmd = _cmd
cmd = self._instantiate(cmd)
for thiscmd in self.commands: