Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4
Conflicts: README.md sql/updates/world/2015_02_06_13_world_335.sql src/server/game/Globals/ObjectMgr.cpp src/server/game/Spells/SpellMgr.cpp
This commit is contained in:
commit
7d5d040948
25 files changed
+467
-391
No files matched your search
@@ -576,8 +576,8 @@ m_caster((info->AttributesEx6 & SPELL_ATTR6_CAST_BY_CHARMER && caster->GetCharme
|
||||
|
||||
m_spellState = SPELL_STATE_NULL;
|
||||
_triggeredCastFlags = triggerFlags;
|
||||
if (info->AttributesEx4 & SPELL_ATTR4_TRIGGERED)
|
||||
_triggeredCastFlags = TriggerCastFlags(TRIGGERED_FULL_MASK & ~TRIGGERED_IGNORE_EQUIPPED_ITEM_REQUIREMENT);
|
||||
if (info->AttributesEx4 & SPELL_ATTR4_CAN_CAST_WHILE_CASTING)
|
||||
_triggeredCastFlags = TriggerCastFlags(uint32(_triggeredCastFlags) | TRIGGERED_IGNORE_CAST_IN_PROGRESS | TRIGGERED_CAST_DIRECTLY);
|
||||
|
||||
m_CastItem = NULL;
|
||||
m_castItemGUID.Clear();
|
||||
|
||||
Reference in new issue
Block a user