diff options
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp | 12 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 6fd3c795c54..22aa46e73a1 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5605,7 +5605,7 @@ SpellCastResult Spell::CheckCast(bool strict) } case SPELL_AURA_MOUNTED: { - if (m_caster->IsInWater() && m_spellInfo->HasAura(SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED)) + if (m_caster->IsInWater() && m_spellInfo->HasAura(m_caster->GetMap()->GetDifficultyID(), SPELL_AURA_MOD_INCREASE_MOUNTED_FLIGHT_SPEED)) return SPELL_FAILED_ONLY_ABOVEWATER; // Ignore map check if spell have AreaId. AreaId already checked and this prevent special mount spells diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index c0c506872db..514185803e1 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3174,10 +3174,6 @@ void SpellMgr::LoadSpellInfoCorrections() case 42492: // Cast Energized spellInfo->AttributesEx |= SPELL_ATTR1_NO_THREAT; break; - case 46842: // Flame Ring - case 46836: // Flame Patch - spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(); - break; case 29726: // Test Ribbon Pole Channel spellInfo->InterruptFlags &= ~AURA_INTERRUPT_FLAG_CAST; break; diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp index 2138cac8bf8..579bfca4993 100644 --- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp +++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp @@ -560,7 +560,7 @@ class npc_halion_controller : public CreatureScript void JustRespawned() override { - if (_instance->GetGuidData(DATA_HALION)) + if (!_instance->GetGuidData(DATA_HALION).IsEmpty()) return; Reset(); @@ -636,7 +636,7 @@ class npc_halion_controller : public CreatureScript _events.ScheduleEvent(EVENT_START_INTRO, Seconds(2)); break; case ACTION_INTRO_HALION_2: - if (_instance->GetGuidData(DATA_HALION)) + if (!_instance->GetGuidData(DATA_HALION).IsEmpty()) return; for (uint8 i = DATA_BURNING_TREE_1; i <= DATA_BURNING_TREE_4; ++i) @@ -715,7 +715,7 @@ class npc_halion_controller : public CreatureScript break; case EVENT_INTRO_PROGRESS_3: DoCast(me, SPELL_FIERY_EXPLOSION); - if (_instance->GetGuidData(DATA_HALION)) + if (!_instance->GetGuidData(DATA_HALION).IsEmpty()) return; if (Creature* halion = me->GetMap()->SummonCreature(NPC_HALION, HalionSpawnPos)) halion->AI()->Talk(SAY_INTRO); @@ -1475,7 +1475,7 @@ class spell_halion_combustion_consumption_periodic : public SpellScriptLoader bool Validate(SpellInfo const* spellInfo) override { - if (!sSpellMgr->GetSpellInfo(spellInfo->Effects[EFFECT_0].TriggerSpell)) + if (!sSpellMgr->GetSpellInfo(spellInfo->GetEffect(EFFECT_0)->TriggerSpell)) return false; return true; } @@ -1487,7 +1487,7 @@ class spell_halion_combustion_consumption_periodic : public SpellScriptLoader if (!caster) return; - uint32 triggerSpell = GetSpellInfo()->Effects[aurEff->GetEffIndex()].TriggerSpell; + uint32 triggerSpell = GetSpellInfo()->GetEffect(aurEff->GetEffIndex())->TriggerSpell; int32 radius = caster->GetObjectScale() * M_PI * 10000 / 3; caster->CastCustomSpell(triggerSpell, SPELLVALUE_RADIUS_MOD, radius, (Unit*)nullptr, TRIGGERED_FULL_MASK, nullptr, aurEff, caster->GetGUID()); @@ -1863,7 +1863,7 @@ class spell_halion_blazing_aura : public SpellScriptLoader void HandleScript(SpellEffIndex effIndex) { PreventHitDefaultEffect(effIndex); - GetHitUnit()->CastSpell(GetHitUnit(), GetSpellInfo()->Effects[EFFECT_1].TriggerSpell); + GetHitUnit()->CastSpell(GetHitUnit(), GetSpellInfo()->GetEffect(EFFECT_1)->TriggerSpell); } void Register() override |