diff options
| -rw-r--r-- | sql/FULL/world_spell_full.sql | 4 | ||||
| -rw-r--r-- | sql/updates/5169_world_spell_linked_spell.sql | 6 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql index 0296dd296cb..f7bd1efbccd 100644 --- a/sql/FULL/world_spell_full.sql +++ b/sql/FULL/world_spell_full.sql @@ -81,7 +81,9 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm ( 34471, 24397, 2, 'The Beast Within'), ( 34471, 26592, 2, 'The Beast Within'), (-59907, 7, 0, 'Lightwell Charges - Suicide'), - +-- Quest +( 40214, 40216, 2, 'Dragonmaw Illusion'), +( 40214, 42016, 2, 'Dragonmaw Illusion'), -- Creature ( 36574, 36650, 0, 'Apply Phase Slip Vulnerability'), -- instance diff --git a/sql/updates/5169_world_spell_linked_spell.sql b/sql/updates/5169_world_spell_linked_spell.sql new file mode 100644 index 00000000000..7c35b08b29e --- /dev/null +++ b/sql/updates/5169_world_spell_linked_spell.sql @@ -0,0 +1,6 @@ +DELETE FROM `spell_area` where spell in (40216,42016); + +DELETE FROM `spell_linked_spell` WHERE spell_trigger = 40214; +INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES +( 40214, 40216, 2, 'Dragonmaw Illusion'), +( 40214, 42016, 2, 'Dragonmaw Illusion'); diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 9e5a2aecab6..a080716b9c6 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -2585,10 +2585,6 @@ void SpellMgr::LoadSpellAreas() SpellCastResult SpellMgr::GetSpellAllowedInLocationError(SpellEntry const *spellInfo, uint32 map_id, uint32 zone_id, uint32 area_id, Player const* player) { - // allow in GM-mode - if (player && player->isGameMaster()) - return SPELL_CAST_OK; - // normal case if (spellInfo->AreaGroupId > 0) { |