From b8b3659bcfc1ace8b73a6ad384bf0460a6adc9ab Mon Sep 17 00:00:00 2001 From: Rumble Date: Sun, 25 Jan 2009 14:04:40 +0000 Subject: [PATCH] Fixed pardon. --Rumble --- changelog | 2 ++ src/act.wizard.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/changelog b/changelog index ce8d7fb..6e777ad 100644 --- a/changelog +++ b/changelog @@ -35,6 +35,8 @@ export (QQ's a zone into a tarball)t Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) (lots of major bugfixes too) tbaMUD 3.59 +[Jan 25 2009] - Rumble + Fixed pardon. (thanks Echos-Ironcastle) [Jan 24 2009] - Rumble Fixed command queue cancelling "--" from cancelling the next command. (thanks Frenze/Ogdin) Fixed object timer values from not saving. (thanks Stoneheart) diff --git a/src/act.wizard.c b/src/act.wizard.c index ee45dd4..3e42d56 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -2267,7 +2267,7 @@ ACMD(do_wizutil) GET_DEX(vict), GET_CON(vict), GET_CHA(vict)); break; case SCMD_PARDON: - if (!PLR_FLAGGED(vict, PLR_THIEF) || !PLR_FLAGGED(vict, PLR_KILLER)) { + if (!PLR_FLAGGED(vict, PLR_THIEF) && !PLR_FLAGGED(vict, PLR_KILLER)) { send_to_char(ch, "Your victim is not flagged.\r\n"); return; }