From 908dff6217320fd2de845e47edf6f72ab5b916a4 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 20 Oct 2019 00:55:59 +0200 Subject: [PATCH] Don't accept random input for 'yes' in CmdDestroy. Resolves #1968. --- evennia/commands/default/building.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py index 5158a2ccb2..095445af2f 100644 --- a/evennia/commands/default/building.py +++ b/evennia/commands/default/building.py @@ -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: