diff options
| -rw-r--r-- | sql/mangos.sql | 2 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 6 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 5 |
3 files changed, 3 insertions, 10 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql index 36860729a4a..512b1d7fa09 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, - `required_7879_01_mangos_spell_proc_event` bit(1) default NULL + `required_7884_02_mangos_playercreateinfo_action` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 0802d92d3f6..12e409e9bcc 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -3986,12 +3986,6 @@ void AuraEffect::HandleAuraModSilence(bool apply, bool Real, bool /*changeAmount for (uint32 i = CURRENT_MELEE_SPELL; i < CURRENT_MAX_SPELL;i++) if (m_target->m_currentSpells[i] && m_target->m_currentSpells[i]->m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE) m_target->InterruptSpell(i,false); // Stop spells on prepare or casting state - - /* - switch (GetId()) - { - } - */ } else { diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index 39076a21d8c..e488253b4b7 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -5612,9 +5612,8 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger if(triggeredByAura->GetCasterGUID() != pVictim->GetGUID()) return false; - // energize amount - basepoints0 = triggerAmount*damage/100; - pVictim->CastCustomSpell(pVictim,34919,&basepoints0,NULL,NULL,true,castItem,triggeredByAura); + // Energize 0.25% of max. mana + pVictim->CastSpell(pVictim,57669,true,castItem,triggeredByAura); return true; // no hidden cooldown } // Divine Aegis |