diff options
| author | ForesterDev <forester.manv@gmail.com> | 2016-05-27 12:51:28 +0400 |
|---|---|---|
| committer | ForesterDev <forester.manv@gmail.com> | 2016-05-27 12:51:28 +0400 |
| commit | c73c51d7b106c11e96e8f11054f3c87e5de426e5 (patch) | |
| tree | 83c6625c875ca10e441804c8d32c0b182c6370cb /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | 8eac30448fa538fa94edf2417c3c39bae6eec9cf (diff) | |
| parent | dc67505a081fed7d59fe833ad9ec5a3741a78e8f (diff) | |
Merge branch '3.3.5' into creature_family
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index afb6255079b..74e94135b86 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -738,7 +738,7 @@ bool ConditionMgr::IsObjectMeetToConditionList(ConditionSourceInfo& sourceInfo, //! If not found, add an entry in the store and set to true (placeholder) if (itr == elseGroupStore.end()) elseGroupStore[condition->ElseGroup] = true; - else if (!(*itr).second) + else if (!(*itr).second) //! If another condition in this group was unmatched before this, don't bother checking (the group is false anyway) continue; if (condition->ReferenceId)//handle reference |