diff --git a/sql/mangos.sql b/sql/mangos.sql index c77125e78..ad8316dfd 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_10411_01_mangos_spell_proc_event` bit(1) default NULL + `required_10416_01_mangos_spell_proc_event` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -18468,6 +18468,7 @@ INSERT INTO `spell_proc_event` VALUES (70748, 0x00, 3, 0x00000000, 0x00000000, 0x00000000, 0x00200000, 0x00200000, 0x00200000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (71406, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000,45.000000, 0), (71545, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000,45.000000, 0), +(71611, 0x7F, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0), (71761, 0x00, 3, 0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0.000000, 0.000000, 0); /*!40000 ALTER TABLE `spell_proc_event` ENABLE KEYS */; diff --git a/sql/updates/10416_01_mangos_spell_proc_event.sql b/sql/updates/10416_01_mangos_spell_proc_event.sql new file mode 100644 index 000000000..09983c12b --- /dev/null +++ b/sql/updates/10416_01_mangos_spell_proc_event.sql @@ -0,0 +1,4 @@ +ALTER TABLE db_version CHANGE COLUMN required_10411_01_mangos_spell_proc_event required_10416_01_mangos_spell_proc_event bit; + +DELETE FROM spell_proc_event WHERE entry = 71611; +INSERT INTO spell_proc_event VALUES (71611, 0x7F, 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 84eb99c2d..1c6c881e2 100644 --- a/sql/updates/Makefile.am +++ b/sql/updates/Makefile.am @@ -88,6 +88,7 @@ pkgdata_DATA = \ 10409_02_mangos_spell_proc_event.sql \ 10410_01_mangos_spell_chain.sql \ 10411_01_mangos_spell_proc_event.sql \ + 10416_01_mangos_spell_proc_event.sql \ README ## Additional files to include when running 'make dist' @@ -156,4 +157,5 @@ EXTRA_DIST = \ 10409_02_mangos_spell_proc_event.sql \ 10410_01_mangos_spell_chain.sql \ 10411_01_mangos_spell_proc_event.sql \ + 10416_01_mangos_spell_proc_event.sql \ README diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 71b89dce9..fc8d80f57 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -940,10 +940,6 @@ bool Aura::CanProcFrom(SpellEntry const *spell, uint32 EventProcEx, uint32 procE } else { - // Check family name - if (spell->SpellFamilyName != GetSpellProto()->SpellFamilyName) - return false; - if (((uint64*)ptr)[0] & spell->SpellFamilyFlags) return true; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 66cd5f541..bbcfa75cd 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 "10415" + #define REVISION_NR "10416" #endif // __REVISION_NR_H__ diff --git a/src/shared/revision_sql.h b/src/shared/revision_sql.h index 96245c863..9c8a4e0c0 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_10332_02_characters_pet_aura" - #define REVISION_DB_MANGOS "required_10411_01_mangos_spell_proc_event" + #define REVISION_DB_MANGOS "required_10416_01_mangos_spell_proc_event" #define REVISION_DB_REALMD "required_10008_01_realmd_realmd_db_version" #endif // __REVISION_SQL_H__