Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix destroy not being informative about moved content. Resolve #2971

Browse source
This commit is contained in:
Griatch 2022-11-07 18:31:14 +01:00
parent 560c9356bb
commit 68d45f3526
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -789,12 +789,12 @@ class CmdDestroy(COMMAND_DEFAULT_CLASS):
"object before continuing."
)
had_exits = hasattr(obj, "exits") and obj.exits
had_objs = hasattr(obj, "contents") and any(
obj
for obj in obj.contents
if not (hasattr(obj, "exits") and obj not in obj.exits)
)
# check if object to delete had exits or objects inside it
obj_exits = obj.exits if hasattr(obj, "exits") else ()
obj_contents = obj.contents if hasattr(obj, "contents") else ()
had_exits = bool(obj_exits)
had_objs = any(entity for entity in obj_contents if entity not in obj_exits)
# do the deletion
okay = obj.delete()
if not okay: