Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-13 19:28:55 -05:00
parent aed17ae5c3 5b9dae20b1
commit eaf0f7d44a
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/TC1_1477_world_spell.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `spell_proc_event` WHERE `entry` = 42370;
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
(42370, 0x00, 11, 0x00000080, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);

7
sql/world_spell_full.sql
View File

@@ -477,3 +477,10 @@ INSERT INTO spell_target_position () VALUES (46019, 580, 1704.34, 928.17, -74.55
INSERT INTO spell_target_position () VALUES (46020, 580, 1704.34, 928.17, 53.079, 0);
INSERT INTO spell_target_position () VALUES (53360, 571, 5807.829, 587.960, 660.939, 1.663);
-- --------
-- PROC
-- --------
DELETE FROM `spell_proc_event` WHERE `entry` IN (42370);
INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
(42370, 0x00, 11, 0x00000080, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); -- Merciless Totem of the Third Wind --

3
src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_alar.cpp
View File

@@ -410,7 +410,8 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
else
{
Unit *target = NULL;
if(Phase1 && target && (target = m_creature->SelectNearestTarget(5)))
target = m_creature->SelectNearestTarget(5);
if(Phase1 && target)
m_creature->AI()->AttackStart(target);
else
{