diff options
author | PolarCookie <sei009@post.uit.no> | 2018-12-03 08:57:23 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-11-16 00:51:51 +0100 |
commit | f377dc23f3bb54180996d3dc570196af75278d00 (patch) | |
tree | 7327a23fd1454656f3559025ed45dbe4387c6cb5 /src/server/game/Conditions/ConditionMgr.cpp | |
parent | c44650502cf7e7285e3e504d238638ac0ccc7ec6 (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
(cherry picked from commit 9d93504f34b112eb2403381e61deff1559771cd3)
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
-rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 93ee5c2625c..95eedba3161 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -558,8 +558,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 |