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

Merge branch 'develop' of https://github.com/aMiss-aWry/evennia into aMiss-aWry-develop

Browse source
This commit is contained in:
Griatch 2022-02-12 14:04:13 +01:00
commit 58454c7109
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2716,13 +2716,13 @@ class CmdExamine(ObjManipCommand):
def format_nattributes(self, obj): def format_nattributes(self, obj):
try: try:
ndb_attr = obj.nattributes.all(return_tuples=True) ndb_attr = obj.nattributes.all()
except Exception: except Exception:
return return
if ndb_attr and ndb_attr[0]: if ndb_attr and ndb_attr[0]:
return "\n " + " \n".join( 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): def format_exits(self, obj):

2
evennia/objects/objects.py
View file

@ -928,7 +928,7 @@ class DefaultObject(ObjectDB, metaclass=TypeclassBase):
try: try:
self.announce_move_from(destination, **kwargs) self.announce_move_from(destination, **kwargs)
except Exception as err: except Exception as err:
logerr(errtxt.format(err="at_announce_move()"), err) logerr(errtxt.format(err="announce_move_from()"), err)
return False return False
# Perform move # Perform move