diff options
| author | QAston <none@none> | 2009-03-08 23:42:42 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2009-03-08 23:42:42 +0100 |
| commit | 56c60f90e6bd1d31fe68fff868e2cfd77d47a8a8 (patch) | |
| tree | 47d6cd0262704910a4b0d515ca4fc4e54fd8accb | |
| parent | 1e1d95fe3aab892e5175ddd5f18b772ffca01c08 (diff) | |
*Fix Illumination and Infusion of Light procs.
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/1764_world.sql | 9 | ||||
| -rw-r--r-- | sql/updates/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 6 |
3 files changed, 14 insertions, 2 deletions
diff --git a/sql/updates/1764_world.sql b/sql/updates/1764_world.sql new file mode 100644 index 00000000000..b87a0488e9c --- /dev/null +++ b/sql/updates/1764_world.sql @@ -0,0 +1,9 @@ +-- Infusion of Light +REPLACE INTO `spell_proc_event` VALUES (54149, 0x00, 10, 2097152, 65536, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); +REPLACE INTO `spell_proc_event` VALUES (53672, 0x00, 10, 2097152, 65536, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); +-- Illumination +REPLACE INTO `spell_proc_event` VALUES (20210, 0x00, 10, 3221225472, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); +REPLACE INTO `spell_proc_event` VALUES (20212, 0x00, 10, 3221225472, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); +REPLACE INTO `spell_proc_event` VALUES (20213, 0x00, 10, 3221225472, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); +REPLACE INTO `spell_proc_event` VALUES (20214, 0x00, 10, 3221225472, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); +REPLACE INTO `spell_proc_event` VALUES (20215, 0x00, 10, 3221225472, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 2aef523c7bc..e009d8ee1ff 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -72,4 +72,5 @@ INSTALL(FILES 1730_world.sql 1732_world.sql 1755_world.sql +1764_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 271a85a4808..7b400f4644e 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -2013,6 +2013,8 @@ void Unit::CalcAbsorbResist(Unit *pVictim,SpellSchoolMask schoolMask, DamageEffe currentAbsorb = mod->m_amount; RemainingDamage=0; } + else + continue; } // Reflective Shield @@ -5919,7 +5921,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu if (dummySpell->SpellIconID == 3017) { // hardcoded amount - basepoints0 = 15 * GetMaxPower(POWER_MANA)/100; + basepoints0 = 15 * GetCreatePowers(POWER_MANA)/100; target = this; triggered_spell_id = 57669; // replenishment @@ -11539,7 +11541,7 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag continue; procTriggered.push_back( ProcTriggeredData(spellProcEvent, itr->second) ); - } + } // Nothing found if (procTriggered.empty()) |