Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Achievements/AchievementMgr.cpp src/server/game/Spells/SpellMgr.cpp src/server/scripts/Commands/cs_npc.cpp
This commit is contained in:
commit
be75ddc2bd
19 files changed
+280
-225
No files matched your search
@@ -781,13 +781,13 @@ void Spell::EffectTriggerSpell(SpellEffIndex effIndex)
|
||||
SpellCastTargets targets;
|
||||
if (effectHandleMode == SPELL_EFFECT_HANDLE_LAUNCH_TARGET)
|
||||
{
|
||||
if (!spellInfo->NeedsToBeTriggeredByCaster())
|
||||
if (!spellInfo->NeedsToBeTriggeredByCaster(m_spellInfo))
|
||||
return;
|
||||
targets.SetUnitTarget(unitTarget);
|
||||
}
|
||||
else //if (effectHandleMode == SPELL_EFFECT_HANDLE_LAUNCH)
|
||||
{
|
||||
if (spellInfo->NeedsToBeTriggeredByCaster() && (m_spellInfo->Effects[effIndex].GetProvidedTargetMask() & TARGET_FLAG_UNIT_MASK))
|
||||
if (spellInfo->NeedsToBeTriggeredByCaster(m_spellInfo) && (m_spellInfo->Effects[effIndex].GetProvidedTargetMask() & TARGET_FLAG_UNIT_MASK))
|
||||
return;
|
||||
|
||||
if (spellInfo->GetExplicitTargetMask() & TARGET_FLAG_DEST_LOCATION)
|
||||
@@ -833,13 +833,13 @@ void Spell::EffectTriggerMissileSpell(SpellEffIndex effIndex)
|
||||
SpellCastTargets targets;
|
||||
if (effectHandleMode == SPELL_EFFECT_HANDLE_HIT_TARGET)
|
||||
{
|
||||
if (!spellInfo->NeedsToBeTriggeredByCaster())
|
||||
if (!spellInfo->NeedsToBeTriggeredByCaster(m_spellInfo))
|
||||
return;
|
||||
targets.SetUnitTarget(unitTarget);
|
||||
}
|
||||
else //if (effectHandleMode == SPELL_EFFECT_HANDLE_HIT)
|
||||
{
|
||||
if (spellInfo->NeedsToBeTriggeredByCaster() && (m_spellInfo->Effects[effIndex].GetProvidedTargetMask() & TARGET_FLAG_UNIT_MASK))
|
||||
if (spellInfo->NeedsToBeTriggeredByCaster(m_spellInfo) && (m_spellInfo->Effects[effIndex].GetProvidedTargetMask() & TARGET_FLAG_UNIT_MASK))
|
||||
return;
|
||||
|
||||
if (spellInfo->GetExplicitTargetMask() & TARGET_FLAG_DEST_LOCATION)
|
||||
@@ -3661,26 +3661,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
|
||||
|
||||
return;
|
||||
}
|
||||
case 58941: // Rock Shards
|
||||
if (unitTarget && m_originalCaster)
|
||||
{
|
||||
for (uint32 i = 0; i < 3; ++i)
|
||||
{
|
||||
m_originalCaster->CastSpell(unitTarget, 58689, true);
|
||||
m_originalCaster->CastSpell(unitTarget, 58692, true);
|
||||
}
|
||||
if (((InstanceMap*)m_originalCaster->GetMap())->GetDifficulty() == REGULAR_DIFFICULTY)
|
||||
{
|
||||
m_originalCaster->CastSpell(unitTarget, 58695, true);
|
||||
m_originalCaster->CastSpell(unitTarget, 58696, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_originalCaster->CastSpell(unitTarget, 60883, true);
|
||||
m_originalCaster->CastSpell(unitTarget, 60884, true);
|
||||
}
|
||||
}
|
||||
return;
|
||||
case 58983: // Big Blizzard Bear
|
||||
{
|
||||
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER)
|
||||
|
||||
Reference in new issue
Block a user