From cb66ff310216c877873d0f49adadc7215c27ca86 Mon Sep 17 00:00:00 2001 From: Naram Qashat Date: Fri, 31 Mar 2017 21:30:40 -0400 Subject: [PATCH] Really fix DiceServData::HasExtended(), earlier fix wasn't working. (Also replacing v3.0.3 tag to here.) --- diceserv.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/diceserv.cpp b/diceserv.cpp index c7773d0..95920ec 100644 --- a/diceserv.cpp +++ b/diceserv.cpp @@ -2520,10 +2520,14 @@ void DiceServData::SendReply(CommandSource &source, const Anope::string &output) bool DiceServData::HasExtended() const { + bool opResultsHasExtended = false; for (int i = 0, len = this->opResults.size(); i < len; ++i) - if (this->opResults[i].empty()) - return false; - return !this->timesPart.empty() && !this->timesResults.empty(); + if (!this->opResults[i].empty()) + { + opResultsHasExtended = true; + break; + } + return (!this->timesPart.empty() && !this->timesResults.empty()) || opResultsHasExtended; } /** A middleman service to prevent the need for most of DiceServData's code being in the header (and thus only defined once here in the core).