diff options
| author | joschiwald <joschiwald@online.de> | 2013-09-05 00:59:22 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald@online.de> | 2013-09-05 00:59:22 +0200 |
| commit | 7ef1f0738be5a063602ec75162626da34e4ecbcf (patch) | |
| tree | 3d69d3a12502ec21fcce7970ebc0b38bdf817abe /src/server/game | |
| parent | d5d0802262637d5b32555ec453b2034b6be247b8 (diff) | |
Core/Battlegrounds/IoC: fix fortress teleport pads
(and replace a hack with an other hack)
Closes #5846
Closes #7993
Ref #8984
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 23 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 8 |
2 files changed, 8 insertions, 23 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 91a5c35955a..45a07fee945 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -1133,29 +1133,6 @@ void Spell::EffectTeleportUnits(SpellEffIndex /*effIndex*/) if (!unitTarget || unitTarget->IsInFlight()) return; - // Pre effects - switch (m_spellInfo->Id) - { - case 66550: // teleports outside (Isle of Conquest) - if (Player* target = unitTarget->ToPlayer()) - { - if (target->GetTeamId() == TEAM_ALLIANCE) - m_targets.SetDst(442.24f, -835.25f, 44.30f, 0.06f, 628); - else - m_targets.SetDst(1120.43f, -762.11f, 47.92f, 2.94f, 628); - } - break; - case 66551: // teleports inside (Isle of Conquest) - if (Player* target = unitTarget->ToPlayer()) - { - if (target->GetTeamId() == TEAM_ALLIANCE) - m_targets.SetDst(389.57f, -832.38f, 48.65f, 3.00f, 628); - else - m_targets.SetDst(1174.85f, -763.24f, 48.72f, 6.26f, 628); - } - break; - } - // If not exist data for dest location - return if (!m_targets.HasDst()) { diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 5d471492553..bc5f8edc9ac 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2975,6 +2975,7 @@ void SpellMgr::LoadSpellInfoCustomAttributes() spellInfo->AttributesCu |= SPELL_ATTR0_CU_NEGATIVE_EFF0; break; case 38729: // Rod of Purification + case 51858: // Siphon of Acherus spellInfo->AttributesCu |= SPELL_ATTR0_CU_TRIGGERED_BY_CASTER; break; default: @@ -3750,6 +3751,13 @@ void SpellMgr::LoadSpellInfoCorrections() // Crashes client on pressing ESC spellInfo->AttributesEx4 &= ~SPELL_ATTR4_TRIGGERED; break; + // ISLE OF CONQUEST SPELLS + // + case 66551: // Teleport + spellInfo->RangeEntry = sSpellRangeStore.LookupEntry(13); // 50000yd + break; + // ENDOF ISLE OF CONQUEST SPELLS + // default: break; } |