diff options
| author | Malcrom <malcromdev@gmail.com> | 2013-01-06 23:17:41 -0330 |
|---|---|---|
| committer | Malcrom <malcromdev@gmail.com> | 2013-01-06 23:17:41 -0330 |
| commit | 161caf860b3aece9b81d1f733018b752e7f5ce44 (patch) | |
| tree | 9931e7f0b501a9680e9594e933df047c31c534da /src/server/game/Conditions/ConditionMgr.cpp | |
| parent | c3166b8608d69dececb2d2ae34c6ada4322fa722 (diff) | |
| parent | 5f28502c0a5a6a480055705c59b074b5333d7d63 (diff) | |
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Conditions/ConditionMgr.cpp')
| -rw-r--r-- | src/server/game/Conditions/ConditionMgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 2116a7dfe94..0526c9276f9 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -489,6 +489,7 @@ uint32 Condition::GetMaxAvailableConditionTargets() case CONDITION_SOURCE_TYPE_GOSSIP_MENU_OPTION: case CONDITION_SOURCE_TYPE_SMART_EVENT: case CONDITION_SOURCE_TYPE_NPC_VENDOR: + case CONDITION_SOURCE_TYPE_SPELL_PROC: return 2; default: return 1; @@ -1403,6 +1404,7 @@ bool ConditionMgr::isSourceTypeValid(Condition* cond) break; } case CONDITION_SOURCE_TYPE_SPELL: + case CONDITION_SOURCE_TYPE_SPELL_PROC: { SpellInfo const* spellProto = sSpellMgr->GetSpellInfo(cond->SourceEntry); if (!spellProto) |