aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Conditions/ConditionMgr.cpp
diff options
context:
space:
mode:
authorPolarCookie <sei009@post.uit.no>2018-12-03 08:57:23 +0100
committerGiacomo Pozzoni <giacomopoz@gmail.com>2018-12-03 08:57:23 +0100
commit9d93504f34b112eb2403381e61deff1559771cd3 (patch)
tree74e8df0be1052405f497f4f1e81152e6acc471e8 /src/server/game/Conditions/ConditionMgr.cpp
parent538c5b86873a4c57e1eb37f0c81c2a7b4552ebc1 (diff)
Quest: Ruthless Cunning and Returning the Favor (#22806)
* Ruthless Cunning and Returning the Favor * no more magic numbers * now with scripted ai and condition * travis * more travis * jackpoz * now with no banner spellscripts * typo * Rename 9999_99_99_99_world.sql to 2018_12_03_00_word.sql
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
-rw-r--r--src/server/game/Conditions/ConditionMgr.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
index a4eaf47a07f..549a1b2f062 100644
--- a/src/server/game/Conditions/ConditionMgr.cpp
+++ b/src/server/game/Conditions/ConditionMgr.cpp
@@ -510,8 +510,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const
if (!condMeets)
sourceInfo.mLastFailedCondition = this;
- bool script = sScriptMgr->OnConditionCheck(this, sourceInfo); // Returns true by default.
- return condMeets && script;
+ return condMeets && sScriptMgr->OnConditionCheck(this, sourceInfo); // Returns true by default.;
}
uint32 Condition::GetSearcherTypeMaskForCondition() const