From 64b9f9e5081a27f22c9c97ac9cf353837cd9f6fa Mon Sep 17 00:00:00 2001 From: Wendy Wang Date: Wed, 9 Feb 2022 14:28:08 +0100 Subject: [PATCH 1/2] Fix for bug #2643: NAttributes on examine. Non-Persistent Attributes now shown in examine. --- evennia/commands/default/building.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py index e42d33ae5d..c60715e01f 100644 --- a/evennia/commands/default/building.py +++ b/evennia/commands/default/building.py @@ -2716,13 +2716,13 @@ class CmdExamine(ObjManipCommand): def format_nattributes(self, obj): try: - ndb_attr = obj.nattributes.all(return_tuples=True) + ndb_attr = obj.nattributes.all() except Exception: return if ndb_attr and ndb_attr[0]: return "\n " + " \n".join( - sorted(self.format_single_attribute(attr) for attr, value in ndb_attr) + sorted(self.format_single_attribute(attr) for attr in ndb_attr) ) def format_exits(self, obj): From 6f4031fea3acb2c2cf66d05ce1f5bb983d0a573a Mon Sep 17 00:00:00 2001 From: Wendy Wang Date: Wed, 9 Feb 2022 14:31:49 +0100 Subject: [PATCH 2/2] Logger error typo fix. announce_move_from() exception currently claims to be at_announce_move(). No longer, with this change! --- evennia/objects/objects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index 4efba09107..ad8d3283e7 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -928,7 +928,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase): try: self.announce_move_from(destination, **kwargs) except Exception as err: - logerr(errtxt.format(err="at_announce_move()"), err) + logerr(errtxt.format(err="announce_move_from()"), err) return False # Perform move