diff options
| author | QAston <none@none> | 2009-03-10 23:22:06 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2009-03-10 23:22:06 +0100 |
| commit | 444bf06830c5331ee3ea5ecec33939705cf67960 (patch) | |
| tree | 0ec8f8ae66b909269853faa5db3388e46b7c81e1 | |
| parent | 6e38f12f3e96de6027363c098c139a1bdaf316e6 (diff) | |
*Fix fire nova totem proc.
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/1814_world.sql | 3 | ||||
| -rw-r--r-- | sql/updates/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 8 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sql/updates/1814_world.sql b/sql/updates/1814_world.sql new file mode 100644 index 00000000000..9fbcc71a96f --- /dev/null +++ b/sql/updates/1814_world.sql @@ -0,0 +1,3 @@ +-- Improved Fire Nova Totem +INSERT INTO `spell_proc_event` VALUES (16086, 0x00, 7, 0, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); +INSERT INTO `spell_proc_event` VALUES (16544, 0x00, 7, 0, 0x00040000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
\ No newline at end of file diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 21cd2a28a7d..dc4dfb35d8b 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -74,4 +74,5 @@ INSTALL(FILES 1755_world.sql 1764_world.sql 1766_world.sql +1814_world.sql DESTINATION share/trinity/sql/updates)
\ No newline at end of file diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 5adf109e2a8..cfd4a8ead5a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -4031,7 +4031,7 @@ bool Unit::RemoveNoStackAurasDueToAura(Aura *Aur) // Remove all auras by aura caster for (uint8 a=0;a<3;++a) { - spellEffectPair spair = spellEffectPair((*i).second->GetId(), a); + spellEffectPair spair = spellEffectPair(i_spellId, a); for(AuraMap::iterator iter = m_Auras.lower_bound(spair); iter != m_Auras.upper_bound(spair);) { if(iter->second->GetCasterGUID()==caster) @@ -6202,6 +6202,12 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu { switch(dummySpell->Id) { + // Improved fire nova totem + case 16544: + { + triggered_spell_id = 16086; + break; + } // Totemic Power (The Earthshatterer set) case 28823: { |