From a38291f1b1aba2055be577dbca16fd98dd14c5bb Mon Sep 17 00:00:00 2001 From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com> Date: Mon, 20 May 2024 14:25:21 -0600 Subject: [PATCH 1/2] remove invalid `None` cmdset value --- evennia/commands/cmdhandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/commands/cmdhandler.py b/evennia/commands/cmdhandler.py index 45605f758b..5d5d29d11f 100644 --- a/evennia/commands/cmdhandler.py +++ b/evennia/commands/cmdhandler.py @@ -350,7 +350,7 @@ def get_and_merge_cmdsets( """ # Gather cmdsets from location, objects in location or carried try: - local_obj_cmdsets = [None] + local_obj_cmdsets = [] try: location = obj.location except Exception: From 379b856e2ae6311130ff504c5e39e9fba139ca9f Mon Sep 17 00:00:00 2001 From: InspectorCaracal <51038201+InspectorCaracal@users.noreply.github.com> Date: Mon, 20 May 2024 14:27:33 -0600 Subject: [PATCH 2/2] don't attempt to msg unset report_to --- evennia/commands/cmdhandler.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/evennia/commands/cmdhandler.py b/evennia/commands/cmdhandler.py index 5d5d29d11f..e8bfe6c4c5 100644 --- a/evennia/commands/cmdhandler.py +++ b/evennia/commands/cmdhandler.py @@ -438,11 +438,12 @@ def get_and_merge_cmdsets( cmdset for cmdset in object_cmdsets if cmdset and cmdset.key != "_EMPTY_CMDSET" ] # report cmdset errors to user (these should already have been logged) - yield [ - report_to.msg(err_helper(cmdset.errmessage, cmdid=cmdid)) - for cmdset in cmdsets - if cmdset.key == "_CMDSET_ERROR" - ] + if report_to: + yield [ + report_to.msg(err_helper(cmdset.errmessage, cmdid=cmdid)) + for cmdset in cmdsets + if cmdset.key == "_CMDSET_ERROR" + ] if cmdsets: # faster to do tuple on list than to build tuple directly