Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 20:02:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Spells: Portal to Orgrimmar & Portal to Stormwind (#23463)

Browse Source 
* Scripts/Spells: Portal to Orgrimmar & Portal to Stormwind

* Revert "Scripts/Spells: Portal to Orgrimmar & Portal to Stormwind"

This reverts commit a8055960

* Revert "Revert "Scripts/Spells: Portal to Orgrimmar & Portal to Stormwind""

This reverts commit a5be792b

* Fix NoPCH

* Clean up

* Clean up

* fixup! Clean up

* Caster -> Target

* Rename 9999_99_99_99_world.sql to 2019_06_22_01_world.sql

(cherry picked from commit ac7c72d633)
This commit is contained in:
Sorikoff
2019-06-22 14:36:53 +00:00
committed by Shauren
parent aa407adf3e
commit 799fba7fd1
3 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/game/Spells/SpellEffects.cpp
View File

@@ -3233,22 +3233,6 @@ void Spell::EffectScriptEffect()
return;
}
case 58418: // Portal to Orgrimmar
case 58420: // Portal to Stormwind
{
if (!unitTarget || unitTarget->GetTypeId() != TYPEID_PLAYER || effectInfo->EffectIndex != 0)
return;
// Effects for 58418 and 58420 are all DIFFICULTY_NONE so always valid
uint32 spellID = m_spellInfo->GetEffect(EFFECT_0).CalcValue();
uint32 questID = m_spellInfo->GetEffect(EFFECT_1).CalcValue();
if (unitTarget->ToPlayer()->GetQuestStatus(questID) == QUEST_STATUS_COMPLETE)
unitTarget->CastSpell(unitTarget, spellID, CastSpellExtraArgs(TRIGGERED_FULL_MASK)
.SetOriginalCastId(m_castId));
return;
}
case 62482: // Grab Crate
{
if (!unitCaster)