diff --git a/sql/mangos.sql b/sql/mangos.sql index 08e5c413f..6863bad34 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -24,7 +24,7 @@ CREATE TABLE `db_version` ( `version` varchar(120) default NULL, `creature_ai_version` varchar(120) default NULL, `cache_id` int(10) default '0', - `required_10217_05_mangos_spell_proc_event` bit(1) default NULL + `required_10219_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -17964,6 +17964,7 @@ INSERT INTO `spell_proc_event` VALUES (35086, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 60), (35100, 0x00, 9, 0x00001000, 0x00001000, 0x00001000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000001, 0x00000100, 0x00000000, 0.000000, 0.000000, 0), (35121, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0), +(36032, 0x40, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (36096, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000800, 0.000000, 0.000000, 0), (36541, 0x04, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (37165, 0x00, 8, 0x00200400, 0x00200400, 0x00200400, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), diff --git a/sql/updates/10219_01_mangos_spell_proc_event.sql b/sql/updates/10219_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..0c0de0c27 --- /dev/null +++ b/sql/updates/10219_01_mangos_spell_proc_event.sql @@ -0,0 +1,4 @@ +ALTER TABLE db_version CHANGE COLUMN required_10217_05_mangos_spell_proc_event required_10219_01_mangos_spell_proc_event bit; + +delete from `spell_proc_event` where entry = 36032; +insert into `spell_proc_event` values (36032, 0x40, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0); \ No newline at end of file diff --git a/sql/updates/Makefile.am b/sql/updates/Makefile.am index 9b2bf4530..eadf2804c 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -116,6 +116,7 @@ pkgdata_DATA = \ 10217_03_mangos_spell_learn_spell.sql \ 10217_04_mangos_spell_chain.sql \ 10217_05_mangos_spell_proc_event.sql \ + 10219_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -212,4 +213,5 @@ EXTRA_DIST = \ 10217_03_mangos_spell_learn_spell.sql \ 10217_04_mangos_spell_chain.sql \ 10217_05_mangos_spell_proc_event.sql \ + 10219_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/UnitAuraProcHandler.cpp b/src/game/UnitAuraProcHandler.cpp index 672976970..0aad36a04 100644 --- a/src/game/UnitAuraProcHandler.cpp +++ b/src/game/UnitAuraProcHandler.cpp @@ -3651,5 +3651,10 @@ SpellAuraProcResult Unit::HandleModDamagePercentDoneAuraProc(Unit* /*pVictim*/, CastCustomSpell(this, 34075, &bp, NULL, NULL, true, castItem, triggeredByAura); } + // Arcane Blast + else if (spellInfo->Id == 36032 && procSpell->SpellFamilyName == SPELLFAMILY_MAGE && procSpell->SpellIconID == 2294) + // prevent proc from self(spell that triggered this aura) + return SPELL_AURA_PROC_FAILED; + return SPELL_AURA_PROC_OK; } \ No newline at end of file diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0a53caed4..6950751c8 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "10218" + #define REVISION_NR "10219" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 746284d85..08bef33e7 100644 --- a/src/shared/revision_sql.h +++ b/src/shared/revision_sql.h @@ -1,6 +1,6 @@ #ifndef __REVISION_SQL_H__ #define __REVISION_SQL_H__ #define REVISION_DB_CHARACTERS "required_10160_02_characters_pet_aura" - #define REVISION_DB_MANGOS "required_10217_05_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_10219_01_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__