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

[#1928] Fix deleting non-existent items

Browse source
This commit is contained in:
Aaron McMillin 2019-09-18 23:17:19 -04:00
parent 772cfda693
commit cb04a71a23
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1697,15 +1697,17 @@ class CmdSetAttribute(ObjManipCommand):
val = obj.attributes.get(key)
deep = self.do_nested_lookup(val, *nested_keys[:-1])
if deep is not self.not_found:
del deep[del_key]
try:
del deep[del_key]
except (IndexError, KeyError, TypeError):
continue
obj.attributes.add(key, val)
return "\nDeleted attribute '%s' (= nested) from %s." % (attr, obj.name)
else:
exists = obj.attributes.has(key)
obj.attributes.remove(attr)
return "\nDeleted attribute '%s' (= %s) from %s." % (attr, exists, obj.name)
else:
return "\n%s has no attribute '%s'." % (obj.name, attr)
return "\n%s has no attribute '%s'." % (obj.name, attr)
def set_attr(self, obj, attr, value):
for key, nested_keys in self.split_nested_attr(attr):