Don't accept random input for 'yes' in CmdDestroy. Resolves #1968.

This commit is contained in:
Griatch 2019-10-20 00:55:59 +02:00
parent 88a49334f2
commit 908dff6217

View file

@ -816,8 +816,12 @@ class CmdDestroy(COMMAND_DEFAULT_CLASS):
answer = yield (confirm)
answer = self.default_confirm if answer == "" else answer
if answer.strip().lower() in ("n", "no"):
caller.msg("Canceled: no object was destroyed.")
if answer and answer not in ("yes", "y", "no", 'n'):
caller.msg("Canceled: Either accept the default by pressing "
"return or specify yes/no.")
delete = False
elif answer.strip().lower() in ("n", "no"):
caller.msg("Canceled: No object was destroyed.")
delete = False
if delete: