diff options
| -rw-r--r-- | sql/mangos.sql | 8 | ||||
| -rw-r--r-- | src/game/SpellAuras.cpp | 15 |
2 files changed, 6 insertions, 17 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql index 42920a97b66..cd5f1a99d6d 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_8030_03_mangos_npc_trainer` bit(1) default NULL + `required_8050_02_mangos_spell_bonus_data` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -17596,7 +17596,8 @@ INSERT INTO `spell_proc_event` VALUES (61346, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (61356, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), (61846, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0.000000, 0.000000, 0), -(61847, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0.000000, 0.000000, 0); +(61847, 0x00000000, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000010, 0.000000, 0.000000, 0), +(63108, 0x00000000, 5, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); /*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */; UNLOCK TABLES; @@ -17843,7 +17844,8 @@ INSERT INTO `spell_bonus_data` VALUES ('18938', '0.96', '0', '0', 'Warlock - Dark Pact Rank 3'), ('27265', '0.96', '0', '0', 'Warlock - Dark Pact Rank 4'), ('59092', '0.96', '0', '0', 'Warlock - Dark Pact Rank 5'), -('6229', '0.3', '0', '0', 'Warlock - Shadow Ward'); +('6229', '0.3', '0', '0', 'Warlock - Shadow Ward'), +('63106', '0', '0', '0', 'Warlock - Siphon Life Triggered'); /*!40000 ALTER TABLE `spell_bonus_data` ENABLE KEYS */; UNLOCK TABLES; diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 6d789765882..287376c7618 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -2839,20 +2839,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount) int32 returnmana = (GetSpellProto()->ManaCostPercentage * caster->GetCreateMana() / 100) * GetParentAura()->GetStackAmount() / 2; caster->CastCustomSpell(caster, 64372, &returnmana, NULL, NULL, true, NULL, this, GetCasterGUID()); } - - /*// have a look if there is still some other Lifebloom dummy aura - Unit::AuraList auras = m_target->GetAurasByType(SPELL_AURA_DUMMY); - for(Unit::AuraList::iterator itr = auras.begin(); itr!=auras.end(); ++itr) - if((*itr)->GetSpellProto()->SpellFamilyName == SPELLFAMILY_DRUID && - (*itr)->GetSpellProto()->SpellFamilyFlags & 0x1000000000LL) - return; - - // final heal - if(m_target->IsInWorld() && m_stackAmount > 0) - { - int32 amount = m_amount / m_stackAmount; - m_target->CastCustomSpell(m_target,33778,&amount,NULL,NULL,true,NULL,this,GetCasterGUID()); - }*/ } return; } @@ -6636,6 +6622,7 @@ void AuraEffect::PeriodicDummyTick() case 34291: case 43182: case 43183: + case 43706: case 46755: case 49472: // Drink Coffee case 57073: |